From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 9 Sep 2011 14:31:59 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~24
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4696680f73e286baad9d6b79591d9f02b1c995e9;p=emacs.git

Merge from trunk.
---

4696680f73e286baad9d6b79591d9f02b1c995e9